More Sync with MM removing old code.