OGM-208 Removing superfluous type parameters