Remove todo in next run loop to fix ember-data issue