initial cleanup of hayneedle step defs