Cleanups for modules in children classes