Remove a few deprecated constructs

The language keeps changing when I'm not looking!