Cleanup
Updating to match changed Biohadoop framework