Removed all references of session