Removed un-needed typedef stuff