cleaning up before major overhaul