clean up before overhaul