fixed conjunction bug

removed unused DAO
removed console outputs
Merge pull request #131 from davvitt/issue#129

fixed conjunction bug