remove use of tools:: and explicitly import from the tools pkg