Got rid of superfluous method