Namespace cleaning (should not change behavior).