Removed old cursor code