Beginning to clean-up this project before building the webapp.