CRUISE: some more renaming, remove another useless variable