Removed superfluous typenames