get rid of ifdef NVM