Remove mv flags from topology (and related files).

Misread the diff; fix made.