Nuke leftover code in Session and sharpen the api