Removed deprecated field stuff