more useless classes
Merge pull request #1140 from rackerlabs/removing-more-dead-code

more useless classes