- removed some pointless typedefs