Removed drools
Merge branch 'remove-drools'