Elevator logic cleanup