Cleaning up project, and preparing to create deployable artifact