fixed conjunction bug

also removed unused DAO

resolves #129