Get rid of Substance Store dependency.