Remove cruft
Use singular getCursor function
Correct atom requirement