Rebuild
Tidy up