Removed a few modules, cleaned up spaces