cleanup and add nvm