Feature and step file clean up