Delete commented code, add vdm tag to code blocks
Merge commit '064b06bff05344a24d01c011f82b979140e4e04c'