Remove unsupported values for now

Change-Id: I3bddaec70c80a5213191e318eb9ff25ae4e070ad