Leveraging underscore a little more, removing outdated prototype functions