Cleanup promise usage.