Cleaned up the modules.