Invert namespace cleanup for better compatibility