Get rid of unused methods