ModuleController API cleanup