Stop using a few deprecated fields