Revert "More Sync with MM removing old code."

This reverts commit 6caacb7873dcfda95e0403ca1f998a98976feaac.

Best to have that Android part to reduce ram loads and opps.