More code removal

And a lot more to go