remove useNS and cleanup