DRY up Cheetah exception handling
Remove dead code
Merge pull request #14 from SUSE/review_141002_cleanup

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