cleaning up namespace cruft