Removed custom tools class