Comment out probably unnecessary defer