Rebuild all from scatch, general clean-up