Clean and rebuild