Removed cruft and cleaned up the module manifests.