remove potentially redundant code