cleanup more ns and files