started cleaning up tool related code