Removal of deprecated ScalarValue type