Cleanup / moved some things from nv