Removed some more stuff to do with legacy mode

Also fixed a typo in an error message.