Removed dependency on azure storage