Cleanup

style guide changes
removed modules