Remove some unneeded step defs