Remove no-longer used fields