diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
index 912531798..ccb104f2f 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
@@ -104,9 +104,6 @@ public final class OverdriveThatMatters {
 	}
 
 	private void setup(final FMLCommonSetupEvent event) {
-		AndroidResearchType.Companion.markRegistryLoaded();
-		AndroidFeatureType.Companion.markRegistryLoaded();
-
 		MatteryNetworking.register();
 		AndroidNetworkChannel.INSTANCE.register();
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt
index b02ced6f2..6108825d2 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt
@@ -26,7 +26,6 @@ open class AndroidFeatureType<T : AndroidFeature> {
 	open fun isApplicable(android: AndroidCapability) = true
 
 	val registryName by lazy {
-		check(AndroidResearchType.IS_REGISTRY_INITIALIZED) { "Trying to access registryName too early!" }
 		MRegistry.ANDROID_FEATURES.getKeyNullable(this)
 	}
 
@@ -41,21 +40,4 @@ open class AndroidFeatureType<T : AndroidFeature> {
 	open val displayId: String by lazy {
 		registryName?.let { "android_feature.${it.namespace}.${it.path}" } ?: "android_feature.null.null"
 	}
-
-	companion object {
-		var IS_REGISTRY_INITIALIZED = false
-			private set
-
-		fun markRegistryLoaded() {
-			IS_REGISTRY_INITIALIZED = true
-		}
-
-		fun assert() {
-			check(IS_REGISTRY_INITIALIZED) { "Registry is not yet initialized" }
-		}
-
-		inline fun assert(lazy: () -> Any) {
-			check(IS_REGISTRY_INITIALIZED, lazy)
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt
index 4e44735ae..c6ffa3ec7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt
@@ -164,8 +164,6 @@ class AndroidResearchBuilder(
 		val iconText = iconText?.copy()
 
 		val features: List<ResolvedFeature> by lazy {
-			check(AndroidFeatureType.IS_REGISTRY_INITIALIZED) { "Trying to build list too early!" }
-
 			val builder = ImmutableList.builder<ResolvedFeature>()
 
 			for (df in defFeatures) {
@@ -370,8 +368,6 @@ class AndroidResearchBuilder(
 				get() = description ?: super.displayDescription
 
 			override val prerequisites: List<AndroidResearchType<*>> by lazy {
-				check(IS_REGISTRY_INITIALIZED) { "Trying to build list too early!" }
-
 				val builder = ImmutableList.builder<AndroidResearchType<*>>()
 
 				for ((value, rigid) in prerequisites) {
@@ -388,8 +384,6 @@ class AndroidResearchBuilder(
 			}
 
 			override val blockedBy: List<AndroidResearchType<*>> by lazy {
-				check(IS_REGISTRY_INITIALIZED) { "Trying to build list too early!" }
-
 				val builder = ImmutableList.builder<AndroidResearchType<*>>()
 
 				for ((value, rigid) in blockers) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
index 25c1ced84..a21b721e6 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
@@ -21,8 +21,6 @@ open class AndroidResearchType<R : AndroidResearch>(
 	open val blockedBy: List<AndroidResearchType<*>> get() = emptyList()
 
 	val blocking: List<AndroidResearchType<*>> by lazy {
-		check(IS_REGISTRY_INITIALIZED) { "Trying to build list too early!" }
-
 		val list = ImmutableList.builder<AndroidResearchType<*>>()
 
 		for (research in MRegistry.ANDROID_RESEARCH) {
@@ -35,8 +33,6 @@ open class AndroidResearchType<R : AndroidResearch>(
 	}
 
 	val unlocks: List<AndroidResearchType<*>> by lazy {
-		check(IS_REGISTRY_INITIALIZED) { "Trying to build list too early!" }
-
 		val list = ImmutableList.builder<AndroidResearchType<*>>()
 
 		for (research in MRegistry.ANDROID_RESEARCH) {
@@ -51,7 +47,6 @@ open class AndroidResearchType<R : AndroidResearch>(
 	fun factory(capability: AndroidCapabilityPlayer) = factory.factory(this, capability)
 
 	val registryName by lazy {
-		check(IS_REGISTRY_INITIALIZED) { "Trying to access registryName too early!" }
 		MRegistry.ANDROID_RESEARCH.getKeyNullable(this)
 	}
 
@@ -75,21 +70,4 @@ open class AndroidResearchType<R : AndroidResearch>(
 	open val displayDescription: List<Component> by lazy {
 		listOf(TranslatableComponent(descriptionId))
 	}
-
-	companion object {
-		var IS_REGISTRY_INITIALIZED = false
-			private set
-
-		fun markRegistryLoaded() {
-			IS_REGISTRY_INITIALIZED = true
-		}
-
-		fun assert() {
-			check(IS_REGISTRY_INITIALIZED) { "Registry is not yet initialized" }
-		}
-
-		inline fun assert(lazy: () -> Any) {
-			check(IS_REGISTRY_INITIALIZED, lazy)
-		}
-	}
 }