Remove now unused legacy stuff
Initial testing
still more to do...