Remove unused classes
Correct cursor instance