Remove while true guard