Get rid of redunant code