Beginning of the cleanup for final submission. Made it through "O" in the web folder.