DROOLS-84 more cleanup