some cleaning after namespace moves