Get rid of reference to methods