NTC fixes
removed unused files