Forgot to checkin clean up of namespaces