Remove more NM parameters.
Move variables type declarations to vars.h