COMP: Remove redundant typedefs that caused compiler warnings