Removed old non-auto generated data structures