removed dependency on ms contracts