diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Enum.java b/j2k/src/org/jetbrains/jet/j2k/ast/Enum.java
index 7756762de7b..3a33049ca66 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Enum.java
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Enum.java
@@ -42,12 +42,11 @@ public class Enum extends Class {
     @NotNull
     @Override
     public String toKotlin() {
+        String primaryConstructorBody = primaryConstructorBodyToKotlin();
         return modifiersToKotlin() + "enum class" + SPACE + myName.toKotlin() + primaryConstructorSignatureToKotlin() +
                typeParametersToKotlin() + implementTypesToKotlin() + SPACE + "{" + N +
                AstUtil.joinNodes(membersExceptConstructors(), N) + N +
-               primaryConstructorBodyToKotlin() + N +
-               "public fun name()  : String { return \"\" }" + N + // TODO : remove hack
-               "public fun order() : Int { return 0 }" + N +
+               (primaryConstructorBody.isEmpty() ? EMPTY : primaryConstructorBody + N) +
                "}";
     }
 }
diff --git a/j2k/tests/testData/ast/enum/class/colorEnum.kt b/j2k/tests/testData/ast/enum/class/colorEnum.kt
index 3f4198497a5..39fb85952d6 100644
--- a/j2k/tests/testData/ast/enum/class/colorEnum.kt
+++ b/j2k/tests/testData/ast/enum/class/colorEnum.kt
@@ -9,6 +9,4 @@ return color
 {
 color = _color
 }
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/emptyEnum.kt b/j2k/tests/testData/ast/enum/class/emptyEnum.kt
index 5be09b23308..c8338128138 100644
--- a/j2k/tests/testData/ast/enum/class/emptyEnum.kt
+++ b/j2k/tests/testData/ast/enum/class/emptyEnum.kt
@@ -1,4 +1,2 @@
 enum class A {
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.kt b/j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.kt
index 01b17c5fc9b..62a8e2019a2 100644
--- a/j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.kt
+++ b/j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.kt
@@ -3,6 +3,4 @@ FOO
 fun foo() : Unit {
 FOO.toString()
 }
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.kt b/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.kt
index 28b251cbf82..9cd0e207155 100644
--- a/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.kt
+++ b/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.kt
@@ -1,4 +1,2 @@
 enum class A : I {
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
index 0ac77787c77..9cf25118b35 100644
--- a/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
+++ b/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
@@ -1,4 +1,2 @@
 enum class A : I0, I1, I2 {
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumWithNameField.kt b/j2k/tests/testData/ast/enum/class/enumWithNameField.kt
index e92d13cb8ce..6419d8e9907 100644
--- a/j2k/tests/testData/ast/enum/class/enumWithNameField.kt
+++ b/j2k/tests/testData/ast/enum/class/enumWithNameField.kt
@@ -1,6 +1,4 @@
 enum class E {
 I
 private var name : String? = null
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt
index fa05a558601..6fdb4ebc7cc 100644
--- a/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt
+++ b/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt
@@ -11,6 +11,4 @@ return code
 {
 code = c
 }
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/internalEnum.kt b/j2k/tests/testData/ast/enum/class/internalEnum.kt
index baaffdb5561..79279032cc3 100644
--- a/j2k/tests/testData/ast/enum/class/internalEnum.kt
+++ b/j2k/tests/testData/ast/enum/class/internalEnum.kt
@@ -1,4 +1,2 @@
 enum class Test {
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/overrideToString.kt b/j2k/tests/testData/ast/enum/class/overrideToString.kt
index 7faa11f73ec..a5653e82eac 100644
--- a/j2k/tests/testData/ast/enum/class/overrideToString.kt
+++ b/j2k/tests/testData/ast/enum/class/overrideToString.kt
@@ -7,6 +7,4 @@ BLUE
 override fun toString() : String? {
 return "COLOR"
 }
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.kt
index 7d0338d9a78..b860f61eeed 100644
--- a/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.kt
+++ b/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.kt
@@ -7,6 +7,4 @@ return code
 {
 code = c
 }
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/privateEnum.kt b/j2k/tests/testData/ast/enum/class/privateEnum.kt
index 646c07af7fa..a3a71c70855 100644
--- a/j2k/tests/testData/ast/enum/class/privateEnum.kt
+++ b/j2k/tests/testData/ast/enum/class/privateEnum.kt
@@ -1,4 +1,2 @@
 private enum class Test {
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/protectedEnum.kt b/j2k/tests/testData/ast/enum/class/protectedEnum.kt
index 6f2b364651a..586bab108fd 100644
--- a/j2k/tests/testData/ast/enum/class/protectedEnum.kt
+++ b/j2k/tests/testData/ast/enum/class/protectedEnum.kt
@@ -1,4 +1,2 @@
 protected enum class Test {
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/publicEnum.kt b/j2k/tests/testData/ast/enum/class/publicEnum.kt
index 5e7e2c3cdd8..4ef7f4c4c6b 100644
--- a/j2k/tests/testData/ast/enum/class/publicEnum.kt
+++ b/j2k/tests/testData/ast/enum/class/publicEnum.kt
@@ -1,4 +1,2 @@
 public enum class Test {
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/runnableImplementation.kt b/j2k/tests/testData/ast/enum/class/runnableImplementation.kt
index e3bce19be72..dbcd73d4440 100644
--- a/j2k/tests/testData/ast/enum/class/runnableImplementation.kt
+++ b/j2k/tests/testData/ast/enum/class/runnableImplementation.kt
@@ -7,6 +7,4 @@ BLUE
 public override fun run() : Unit {
 System.out?.println("name()=" + name() + ", toString()=" + toString())
 }
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/typeSafeEnum.kt b/j2k/tests/testData/ast/enum/class/typeSafeEnum.kt
index a8b4e8b2a83..7d80ec0ac2f 100644
--- a/j2k/tests/testData/ast/enum/class/typeSafeEnum.kt
+++ b/j2k/tests/testData/ast/enum/class/typeSafeEnum.kt
@@ -3,6 +3,4 @@ PENNY
 NICKEL
 DIME
 QUARTER
-public fun name() : String { return "" }
-public fun order() : Int { return 0 }
 }
\ No newline at end of file