small namespace cleanup