some data namespace cleanup