Scrubs out more unused helpers.
Gets rid of :w vim artifact :).