Removed some unused functionality.
Merge pull request #1 from hpcloud-mon/feature/misc

Removed some unused functionality.