namspace cleanup