next dev version; ns cleanup