Remove some more nonvolatile
Merge pull request #367 from bastih/master

Clean up makefiles, reduce build time on no-change build
Minimalist printer now even more minimal
Merge pull request #370 from bastih/master

More cleanups
Merge remote-tracking branch 'upstream/master' into feature/kill_vid_table
Safeguard usage of between
Remove commented out methods