Cleaning up some more cruft
Merge pull request #4 from kevinearls/CRUFT-0001

Cleaning up some more cruft