Entity tidy up, session token entity