Remove session scope until a better plan can be put in place