removed some autogenereation