Some minor namespace updates, removal of commented code,