Remove references to sessions from views

Replaced with higher level functions