Cleanup distro check in tools