clean up deprecated
clean up deprecated

Tyvonne/MagicMirror,Tyvonne/MagicMirror,MichMich/MagicMirror,Tyvonne/MagicMirror,MichMich/MagicMirror,Tyvonne/MagicMirror,MichMich/MagicMirror,MichMich/MagicMirror