hijackCode abstracted for better stack trace
cleanup code
Merge branch 'hijack-connection'
merged with master
moved cursor hijack code into utils