removed some auto generated staff