Remove notes to self
Fix bug with AdvancedModules