Cleaning up front end logout logic