Cleanup and rebuild