remove typedefs for enums and useless code
solve enum type compilation problems that came with removing the typedef