General clean up of project