Even more namespace cleanup and dead code removal!