Some cleanup, removing unneeded fields