removed _ModuleWrapper subclasses