Removing unused, autogenerated, code