Enable gradle daemon
Refactoring, removing unused method, renaming addListener2_ to addListener_