Get rid of some stub methods