diff --git a/MVMCoreUI/Molecules/ModuleMolecule.swift b/MVMCoreUI/Molecules/ModuleMolecule.swift
index 3b49544c..e2411ec0 100644
--- a/MVMCoreUI/Molecules/ModuleMolecule.swift
+++ b/MVMCoreUI/Molecules/ModuleMolecule.swift
@@ -23,7 +23,7 @@ open class ModuleMolecule: Container {
         super.setWithModel(model, delegateObject, additionalData)
 
         guard let moduleMoleculeModel = model as? ModuleMoleculeModel,
-            let moduleModel = delegateObject?.moleculeDelegate?.getModuleWithName(moduleMoleculeModel.moduleName) as? MoleculeProtocol else {
+            let moduleModel = delegateObject?.moleculeDelegate?.getModuleWithName(moduleMoleculeModel.moduleName) else {
         // Critical error
                 return
         }
@@ -49,7 +49,7 @@ open class ModuleMolecule: Container {
     public static func estimatedHeight(forRow molecule: MoleculeProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
 
         guard let moduleMolecule = molecule as? ModuleMoleculeModel,
-            let moduleModel = delegateObject?.moleculeDelegate?.getModuleWithName(moduleMolecule.moduleName) as? MoleculeProtocol,
+            let moduleModel = delegateObject?.moleculeDelegate?.getModuleWithName(moduleMolecule.moduleName),
             let classType = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(moduleModel) as? ModelMoleculeViewProtocol.Type,
             let height = classType.estimatedHeight(forRow: moduleModel, delegateObject: delegateObject)else {
                 // Critical error
@@ -60,7 +60,7 @@ open class ModuleMolecule: Container {
 
     public override func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
         guard let moduleMolecule = model as? ModuleMoleculeModel,
-            let moduleModel = delegateObject?.moleculeDelegate?.getModuleWithName(moduleMolecule.moduleName) as? MoleculeProtocol,
+            let moduleModel = delegateObject?.moleculeDelegate?.getModuleWithName(moduleMolecule.moduleName),
             let classType = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(moduleModel) as? ModelMoleculeViewProtocol,
                let name = classType.nameForReuse(moduleModel, delegateObject) else {
                 // Critical error
@@ -69,7 +69,6 @@ open class ModuleMolecule: Container {
         return name
     }
 
-    //TODO: Scottt please check this.
     public static func requiredModules(_ molecule: MoleculeProtocol?, delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]? {
 
         guard let moduleName = (molecule as? ModuleMoleculeModel)?.moduleName,