Removed deprecated fields