getting rid of _old files
cleaning up dead code