[DROOLS-19] fix failing tests + remove unused code