began to move code into legacy and remove dead code