Cleaned up build strategy