Removed deadcode, remove old cursors.