rm redundant code