[Review] Request from 'aduffeck' @ 'SUSE/pennyworth/review_141002_cleanup'

Please review the following changes:
  * 90b48f1 Remove dead code
  * 49dd049 DRY up Cheetah exception handling