Cleanup for build