Try freeing context independently of other things
Removed some old comments