some cleanup and new build