Removed modules, simplification of app