WEB-180 Cleaned up the build