Cleanup from autogenerate code