cleaning up and new build