- removed unneeded typedefs