Cleaned up stuff in core ns