Removed unnecessary lines and added token removal