Tech Debt: Vim plugin clean up