Clean rebuild