Directions cleanup