AGPUSH-220 "Clean up build process"