Clean up nvm load path logic