cleaning up ns declarations