Cleanup: removed deprecated fields