Revert f043ccd..532e8b6

This rolls back to commit f043ccdc847c21c0ac92fe5c165a0d5abc9ca6a6.
Cleaning Up Module