general namespace cleanup