Removed unused token and key