chore($handler-cleanup): Azure handler cleanup #1157