Removing _TYPE