Feature/ns ts removal