Issue #4 and cleanup

Fixed #4, and removed some unnecessary code. Close #4.

Note: I will know begin working on the UUID changes so there will be no
more fixes until that version is complete.