Removed some more auto gen'd stubs