Full rebuild + cleaner code