Get rid of stub method