Removed async stuff