Clean up hijack
Merge pull request #183 from swipely/cleanup-hijack

Clean up hijack