Fixed tokens never timing out serverside and Remove token