Cleanup after 967f1f9d to remove extraneous method