AZURE-78 - Remove unused dlls and namespaces. Catch specific exceptions