Immutablize, clean NS