cleanup Way

from instead of location
world on the fly