cleaned up some stuff that became redudent
Merge pull request #1 from jfly/testbranch

cleaned up some stuff that became redudent