Removed unnecessary cursor tracking.