Removing auto-generated stuff