Remove debug/test code
Merge pull request #45 from mattdenner/removing_debug_code

Remove debug/test code