Distance cleanup