Cleaned up ns requires after previous refactoring