Minor changes, added method to remove token from credential store.