Cleanup: removed deprecated settings