Continued cleaning up building scripts