Removed extra modules that were not need