Cleaning & spedding up build process