Cursor access cleanup