removing more autogenned stuff