Do less work on build, added cleanup steps