Remove cursor implemenation