Removed unused generated files, reconfigured genenerators