Removed cursor implementation, comment fixes