Remove commented out code originally from parameterized-provider branch.