Remove deprecated code.
Add vim lines.