Removed typedefs