Removed some types that are no longer required.