More issues with direct DSN & namespace cleanup