Remove some unnecessary old code