Remove commented out code
Fix hlink warnings in Vim2 test directory