vim: fix merge failure, remove dead code