Clean up extraneous code
Merge pull request #10 from brian-frichette/cleanup

Clean up extraneous code