diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj b/src/Xamarin.Android.Tools.Bytecode/Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj
deleted file mode 100644
index 1bf531b3d..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {C9FA4492-DEB0-4932-A6B8-E2C4E0581692}
- Library
- Xamarin.Android.Tools.BytecodeTests
- Xamarin.Android.Tools.Bytecode-Tests
- v4.6.1
- 8.0.30703
- 2.0
-
-
- true
- full
- false
- $(ToolOutputFullPath)
- DEBUG;
- prompt
- 4
- false
-
-
- full
- true
- $(ToolOutputFullPath)
- prompt
- 4
- false
-
-
-
- ..\..\..\packages\protobuf-net.2.4.1\lib\net40\protobuf-net.dll
-
-
-
-
-
-
-
-
- ..\..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BuildClasses;
- BuildKotlinClasses;
- $(BuildDependsOn)
-
-
-
-
-
- {B17475BC-45A2-47A3-B8FC-62F3A0959EE0}
- Xamarin.Android.Tools.Bytecode
-
-
-
-
- JavaAnnotation.xml
-
-
- JavaEnum.xml
-
-
- JavaType.xml
-
-
- JavaType$1.xml
-
-
- IJavaInterface.xml
-
-
- NonGenericGlobalType.xml
-
-
- ParameterFixup.xml
-
-
- ParameterFixupFromDocs.xml
-
-
- JavaAnnotation.class
-
-
- JavaEnum.class
-
-
- JavaType.class
-
-
- JavaType$1.class
-
-
- JavaType$ASC.class
-
-
- JavaType$ASC.xml
-
-
- JavaType$RNC.class
-
-
- JavaType$RNC.xml
-
-
- JavaType$RNC$RPNC.class
-
-
- JavaType$RNC$RPNC.xml
-
-
- JavaType$PSC.class
-
-
- JavaType$PSC.xml
-
-
- IJavaInterface.class
-
-
- NestedInterface$DnsSdTxtRecordListener.class
-
-
- NonGenericGlobalType.class
-
-
- IParameterInterface.class
-
-
- ParameterAbstractClass.class
-
-
- ParameterClass.class
-
-
- ParameterClass2.class
-
-
- Collection.class
-
-
- ParameterFixupApiXmlDocs.xml
-
-
- ParameterDescription.txt
-
-
- ParameterFixupFromDescriptionText.xml
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/Xamarin.Android.Tools.Bytecode-Tests.targets b/src/Xamarin.Android.Tools.Bytecode/Tests/Xamarin.Android.Tools.Bytecode-Tests.targets
deleted file mode 100644
index fb3706e2e..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/Xamarin.Android.Tools.Bytecode-Tests.targets
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject$Companion.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject$Companion.class
deleted file mode 100644
index d01d39fc6..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject$Companion.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject.class
deleted file mode 100644
index c380cd78a..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject.kt
deleted file mode 100644
index 69f889861..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/CompanionObject.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class CompanionObject {
- companion object { }
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/DataClass.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/DataClass.class
deleted file mode 100644
index 84aafabbb..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/DataClass.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/DataClass.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/DataClass.kt
deleted file mode 100644
index c75507a7f..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/DataClass.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-data class DataClass(val name: String = "", val age: Int = 0) {
- var weight: Int = 0
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClass.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClass.class
deleted file mode 100644
index 2a2f4701f..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClass.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClass.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClass.kt
deleted file mode 100644
index d8026e828..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClass.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-enum class EnumClass {
- NORTH, SOUTH, WEST, EAST
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces$PLUS.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces$PLUS.class
deleted file mode 100644
index 16e36be4b..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces$PLUS.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces$TIMES.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces$TIMES.class
deleted file mode 100644
index 571111d3a..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces$TIMES.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces.class
deleted file mode 100644
index da1b369c8..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces.kt
deleted file mode 100644
index 5b2efc376..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfaces.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-interface EnumClassWithInterfacesInterface {
- fun apply(t: Int, u: Int) : Int
- fun applyAsInt(t: Int, u: Int) : Int
-}
-
-enum class EnumClassWithInterfaces : EnumClassWithInterfacesInterface {
- PLUS {
- override fun apply(t: Int, u: Int): Int = t + u
- },
- TIMES {
- override fun apply(t: Int, u: Int): Int = t * u
- };
-
- override fun applyAsInt(t: Int, u: Int) = apply(t, u)
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfacesInterface.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfacesInterface.class
deleted file mode 100644
index 3b63f4fa4..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/EnumClassWithInterfacesInterface.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ExtensionMethods.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ExtensionMethods.class
deleted file mode 100644
index 4065ea2b8..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ExtensionMethods.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ExtensionMethods.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ExtensionMethods.kt
deleted file mode 100644
index 4c6ac694e..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ExtensionMethods.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-class ExtensionMethods {
- fun MutableList.swap(index1: Int, index2: Int) {
- val tmp = this[index1] // 'this' corresponds to the list
- this[index1] = this[index2]
- this[index2] = tmp
- }
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InlineClass.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InlineClass.class
deleted file mode 100644
index c3c2b48ae..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InlineClass.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InlineClass.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InlineClass.kt
deleted file mode 100644
index c137def4e..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InlineClass.kt
+++ /dev/null
@@ -1 +0,0 @@
-inline class InlineClass(val value: String)
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Interfaces.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Interfaces.kt
deleted file mode 100644
index d4a01df59..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Interfaces.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-interface MyInterface {
- fun bar()
-
- val prop: Int // abstract
-
- val propertyWithImplementation: String
- get() = "foo"
-
- fun foo() {
- print(prop)
- }
-}
-
-class MyInterfaceChild : MyInterface {
- override val prop: Int = 29
-
- override fun bar() {
- // body
- }
-}
-
-interface MyInterface2 : MyInterface {
- val value2 : Int
-
- override val prop: Int get() = 30
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalConstructor.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalConstructor.class
deleted file mode 100644
index 2e8406b54..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalConstructor.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalConstructor.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalConstructor.kt
deleted file mode 100644
index a1a474467..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalConstructor.kt
+++ /dev/null
@@ -1 +0,0 @@
-class InternalConstructor internal constructor (private var myInt : Int)
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalMethod.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalMethod.class
deleted file mode 100644
index a4edaafc8..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalMethod.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalMethod.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalMethod.kt
deleted file mode 100644
index 8ad206d17..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalMethod.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class InternalMethod {
- internal fun take()
- {
- }
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalProperty.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalProperty.class
deleted file mode 100644
index 4b8dccef2..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalProperty.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalProperty.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalProperty.kt
deleted file mode 100644
index 45b4922b0..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/InternalProperty.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class InternalProperty {
- internal var city: String = "London"
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MethodImplementation.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MethodImplementation.class
deleted file mode 100644
index a046801a3..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MethodImplementation.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MethodImplementation.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MethodImplementation.kt
deleted file mode 100644
index 5e216da38..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MethodImplementation.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-public inline class MethodImplementation constructor(@PublishedApi internal val data: Short) : Comparable {
- public override fun toString(): String = "woof"
-
- override operator fun compareTo(other: Short): Int {
- return 0;
- }
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface$DefaultImpls.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface$DefaultImpls.class
deleted file mode 100644
index e8c60b1dc..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface$DefaultImpls.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface.class
deleted file mode 100644
index cecdbcd32..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface2$DefaultImpls.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface2$DefaultImpls.class
deleted file mode 100644
index 66bbbb170..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface2$DefaultImpls.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface2.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface2.class
deleted file mode 100644
index 3f77774fc..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterface2.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterfaceChild.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterfaceChild.class
deleted file mode 100644
index 34521a364..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/MyInterfaceChild.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Object.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Object.class
deleted file mode 100644
index 0fd447986..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Object.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Object.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Object.kt
deleted file mode 100644
index fe0184116..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/Object.kt
+++ /dev/null
@@ -1 +0,0 @@
-object Object { }
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ParameterName.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ParameterName.class
deleted file mode 100644
index 0927cd7df..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ParameterName.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ParameterName.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ParameterName.kt
deleted file mode 100644
index 43fbf79dc..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/ParameterName.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-interface ParameterName {
- fun take(count: Int)
-}
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/RenameExtensionParameter.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/RenameExtensionParameter.kt
deleted file mode 100644
index 70f80bd1d..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/RenameExtensionParameter.kt
+++ /dev/null
@@ -1 +0,0 @@
-internal fun ByteArray.toUtf8String(): String = String(this, Charsets.UTF_8)
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/RenameExtensionParameterKt.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/RenameExtensionParameterKt.class
deleted file mode 100644
index 00542d8f5..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/RenameExtensionParameterKt.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SealedClass.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SealedClass.class
deleted file mode 100644
index 0a0ff0789..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SealedClass.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SealedClass.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SealedClass.kt
deleted file mode 100644
index 5fdb470d1..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SealedClass.kt
+++ /dev/null
@@ -1 +0,0 @@
-sealed class SealedClass
\ No newline at end of file
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SetterParameterName.class b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SetterParameterName.class
deleted file mode 100644
index 43822c967..000000000
Binary files a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SetterParameterName.class and /dev/null differ
diff --git a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SetterParameterName.kt b/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SetterParameterName.kt
deleted file mode 100644
index 7b261cd7b..000000000
--- a/src/Xamarin.Android.Tools.Bytecode/Tests/kotlin/SetterParameterName.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-interface SetterParameterName {
- var city: String
-}
\ No newline at end of file