Remove some old code