Remove $(V1 and $(V2 ...) macro calls

Since there is a specific branch for D1, it makes no sense to keep those
macros. All the content from $(V2 ...) macros is removed, while the contents
from $(V1 ...) is kept, but without being inside a macro.

The output of this change was tested against the previous output and, beside
some white-space related differences (fixes), the look exactly the same.