Removed unused imports
Removed N&S name
Updated changelog