WEB-180 Cleaned up build