Removed ns fixes