Cleanup - removal of the '2' versions of some methods