diff --git a/libraries/stdlib/src/kotlin/dom/Dom.kt b/libraries/stdlib/src/kotlin/dom/Dom.kt
index fa2b9030511..f8b1bbb6fc6 100644
--- a/libraries/stdlib/src/kotlin/dom/Dom.kt
+++ b/libraries/stdlib/src/kotlin/dom/Dom.kt
@@ -333,7 +333,7 @@ fun NodeList?.toXmlString(xmlDeclaration: Boolean = false): String {
 /** Converts the collection of nodes to an XML String */
 public fun nodesToXmlString(nodes: Iterable<Node>, xmlDeclaration: Boolean = false): String {
     // TODO this should work...
-    // return this.map<Node,String>{it.toXmlString()}.makeString("")
+    // return this.map{it.toXmlString()}.makeString("")
     val builder = StringBuilder()
     for (n in nodes) {
         builder.append(n.toXmlString(xmlDeclaration))
diff --git a/libraries/stdlib/src/kotlin/dom/DomJVM.kt b/libraries/stdlib/src/kotlin/dom/DomJVM.kt
index 8cf42bf6104..9190416826a 100644
--- a/libraries/stdlib/src/kotlin/dom/DomJVM.kt
+++ b/libraries/stdlib/src/kotlin/dom/DomJVM.kt
@@ -110,7 +110,7 @@ get() = childNodes.outerHTML
  * Returns the HTML representation of the nodes
  */
 public val NodeList.outerHTML: String
-get() = toList().map<Node, String> { it.innerHTML }.makeString("")
+get() = toList().map { it.innerHTML }.makeString("")
 
 /** Returns an [[Iterator]] of all the next [[Element]] siblings */
 fun Node.nextElements(): Iterator<Element> = nextSiblings().filterIsInstance<Node, Element>(javaClass<Element>())
diff --git a/libraries/stdlib/test/CollectionTest.kt b/libraries/stdlib/test/CollectionTest.kt
index 9e8a8ca777e..4a2fcc16c27 100644
--- a/libraries/stdlib/test/CollectionTest.kt
+++ b/libraries/stdlib/test/CollectionTest.kt
@@ -132,7 +132,7 @@ class CollectionTest {
         // lets concatenate some strings
         expect("1234") {
             val numbers = arrayList(1, 2, 3, 4)
-            numbers.map<Int, String>{it.toString()}.fold(""){ a, b -> a + b}
+            numbers.map{it.toString()}.fold(""){ a, b -> a + b}
         }
     }
 
@@ -146,7 +146,7 @@ class CollectionTest {
     test fun foldRight() {
         expect("1234") {
             val numbers = arrayList(1, 2, 3, 4)
-            numbers.map<Int, String>{it.toString()}.foldRight(""){ a, b -> a + b}
+            numbers.map{it.toString()}.foldRight(""){ a, b -> a + b}
         }
     }
 
@@ -198,14 +198,9 @@ class CollectionTest {
         assertEquals("a, b, c, *", text2)
     }
 
-    /*
-        TODO compiler bug
-        we should be able to remove the explicit type <String,Int> on the map function
-        http://youtrack.jetbrains.net/issue/KT-1145
-    */
     test fun map() {
         val data = arrayList("foo", "bar")
-        val lengths = data.map<String, Int>{ it.length }
+        val lengths = data.map{ it.length }
         assertTrue {
             lengths.all{it == 3}
         }
diff --git a/libraries/stdlib/test/MapTest.kt b/libraries/stdlib/test/MapTest.kt
index d3c48523f93..fabbc08d1b9 100644
--- a/libraries/stdlib/test/MapTest.kt
+++ b/libraries/stdlib/test/MapTest.kt
@@ -80,33 +80,23 @@ class MapTest {
         assertEquals("beverage,beer,location,Mells,name,James", list.makeString(","))
     }
 
-    /*
-        TODO compiler bug
-        we should be able to remove the explicit type <String,String,String> on the map function
-        http://youtrack.jetbrains.net/issue/KT-1145
-    */
     test fun map() {
         val m1 = TreeMap<String, String>()
         m1["beverage"] = "beer"
         m1["location"] = "Mells"
 
-        val list = m1.map<String,String,String>{ it.value + " rocks" }
+        val list = m1.map{ it.value + " rocks" }
 
         println("Got new list $list")
         assertEquals(arrayList("beer rocks", "Mells rocks"), list)
     }
 
-    /*
-        TODO compiler bug
-        we should be able to remove the explicit type <String,String,String> on the mapValues function
-        http://youtrack.jetbrains.net/issue/KT-1145
-    */
     test fun mapValues() {
         val m1 = TreeMap<String, String>()
         m1["beverage"] = "beer"
         m1["location"] = "Mells"
 
-        val m2 = m1.mapValues<String,String,String>{ it.value + "2" }
+        val m2 = m1.mapValues{ it.value + "2" }
 
         println("Got new map $m2")
         assertEquals(arrayList("beer2", "Mells2"), m2.values().toList())
diff --git a/libraries/stdlib/test/SetTest.kt b/libraries/stdlib/test/SetTest.kt
index c0aeab663d3..723a0cf6e59 100644
--- a/libraries/stdlib/test/SetTest.kt
+++ b/libraries/stdlib/test/SetTest.kt
@@ -54,7 +54,7 @@ class SetTest {
           we should be able to remove the explicit type on the function
           http://youtrack.jetbrains.net/issue/KT-849
         */
-        val lengths = data.map<String, Int>{(s: String) -> s.length}
+        val lengths = data.map{s -> s.length}
         assertTrue {
             lengths.all{it == 3}
         }
diff --git a/libraries/stdlib/test/js/MapJsTest.kt b/libraries/stdlib/test/js/MapJsTest.kt
index d6758414014..82b75fa75ad 100644
--- a/libraries/stdlib/test/js/MapJsTest.kt
+++ b/libraries/stdlib/test/js/MapJsTest.kt
@@ -113,7 +113,7 @@ class MapJsTest {
         m1["beverage"] = "beer"
         m1["location"] = "Mells"
 
-        val list = m1.map<String,String,String>{ it.value + " rocks" }
+        val list = m1.map{ it.value + " rocks" }
 
         println("Got new list $list")
         assertEquals(arrayList("beer rocks", "Mells rocks"), list)
@@ -124,7 +124,7 @@ class MapJsTest {
         m1["beverage"] = "beer"
         m1["location"] = "Mells"
 
-        val m2 = m1.mapValues<String,String,String>{ it.value + "2" }
+        val m2 = m1.mapValues{ it.value + "2" }
 
         println("Got new map $m2")
         assertEquals(arrayList("beer2", "Mells2"), m2.values().toList())
diff --git a/libraries/stdlib/test/language/StringExpressionExampleTest.kt b/libraries/stdlib/test/language/StringExpressionExampleTest.kt
index 6260599d5df..4f7bebbc7dd 100644
--- a/libraries/stdlib/test/language/StringExpressionExampleTest.kt
+++ b/libraries/stdlib/test/language/StringExpressionExampleTest.kt
@@ -17,7 +17,7 @@ fun customerTemplate(customer: Customer) = """
 <body>
 <h1>Hello ${customer.name}</h1>
 <ul>
-${customer.products.map<Product,String>{ productSnippet(it) }.makeString("\n")}
+${customer.products.map{ productSnippet(it) }.makeString("\n")}
 </ul>
 <p>lets do some kool stuff</p>
 </body>
diff --git a/libraries/stdlib/test/language/scala/OptionTest.kt b/libraries/stdlib/test/language/scala/OptionTest.kt
index e08a31813f1..8f5a3af41c1 100644
--- a/libraries/stdlib/test/language/scala/OptionTest.kt
+++ b/libraries/stdlib/test/language/scala/OptionTest.kt
@@ -105,11 +105,8 @@ class OptionTest: TestCase() {
             */
     
             val name = request.getParameter("name")
-            val upper = name.map<String, String>{ it.trim() }.filter{ it.length != 0 }.map<String, String>{ it.toUpperCase() }
+            val upper = name.map{ it.trim() }.filter{ it.length != 0 }.map{ it.toUpperCase() }
             return upper ?: ""
-    
-            // TODO when http://youtrack.jetbrains.com/issue/KT-1145 is fixed
-            // we can get rid of the unnecessary <String, String> on map
         }
     
         assertEquals("", foo(Request(null)))
diff --git a/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateJavaScriptStubs.kt b/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateJavaScriptStubs.kt
index f0fe2e1586e..a6759483829 100644
--- a/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateJavaScriptStubs.kt
+++ b/libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateJavaScriptStubs.kt
@@ -144,7 +144,7 @@ import js.noImpl
 
                     // TODO in java 7 its not easy with reflection to get the parameter argument name...
                     var counter = 0
-                    val parameters = parameterTypes.map<Class<out Any?>?, String>{ "arg${++counter}: ${parameterTypeName(it)}" }.makeString(", ")
+                    val parameters = parameterTypes.map{ "arg${++counter}: ${parameterTypeName(it)}" }.makeString(", ")
                     val returnType = simpleTypeName(method.getReturnType())
                     println("    public fun ${method.getName()}($parameters): $returnType = js.noImpl")
                 }
diff --git a/libraries/stdlib/test/regressions/Kt1617Test.kt b/libraries/stdlib/test/regressions/Kt1617Test.kt
index 15e23870a10..204c7ed6494 100644
--- a/libraries/stdlib/test/regressions/Kt1617Test.kt
+++ b/libraries/stdlib/test/regressions/Kt1617Test.kt
@@ -12,7 +12,7 @@ class Kt1617Test: TestCase() {
     fun testMapFunction() {
         val coll: Collection<String> = arrayList("foo", "bar")
 
-        val files =  coll.map<String, File>{ File(it) }
+        val files =  coll.map{ File(it) }
 
         println("Found files: $files")
     }