Removed more obsolete modules.