Removal of a bunch of duplicate method definitions...