From Jason: Remove unused declaration.
From Jason: Remove cmd from Noteskins.
From Jason: Forgot about these changes.
Merge branch 'sm5-transplant'
Merge branch 'master' into sm6