Remove old redundant code