cleanup old-code, prepare for updates