Remove a few type aliases