Squashed commit of the following:

commit 62c459b1999207a7fd98577fab09d34db5ba3951
Author: John Sirois <jsirois@twitter.com>
Date:   Tue Mar 4 10:17:37 2014 -0700

    Kill unused cruft.