remember removed to be replaced with database token check