code cleanup and new build