Remove typedef struct