Replacing (noir.session/put! x nil) w/ (noir.session/remove! x)
Simplify code a bit