Some cleanup of features/step defs.