More ordering, and force directory removal.