removed additional redundant code