Remove methods that handlers now take care of