Remove unnecessary code from old merge
Remove unnecessary code from old merge

lsegal/yard,amclain/yard,lsegal/yard,iankronquist/yard,ohai/yard,jreinert/yard,jreinert/yard,iankronquist/yard,alexdowad/yard,travis-repos/yard,thomthom/yard,amclain/yard,ohai/yard,lsegal/yard,iankronquist/yard,alexdowad/yard,travis-repos/yard,jreinert/yard,ohai/yard,thomthom/yard,thomthom/yard,herosky/yard,herosky/yard,herosky/yard,amclain/yard,alexdowad/yard