Initial clean and rebuild of solution