lint fixes, move non-scanning non-verses out