Remove some older code