Cleanup
Removed extra modules