Major clean up of project