Remove getTypeToExpandTo, since it isn't adding much value