Fixing some rebase conflicts
Reorganized things and got Azure diagnostics working
Finished cleanup