restore Steve's deleteway stuff