Why commented out? Can we either delete or deprecate it instead?