Removed vestiges of type.