Simplified build
Clean up build