combo namespace cleanup