Fix remote move and clean messages