clean up SMDI support commit: