chore($handler-cleanup): abc order #1157
chore($handler-cleanup): Azure converted, unit tests passing #1157

Still lots of cleanup left