refactoring: removed itool based implementation