Some cleaning up of modules.