Diagnostics update; removed ad-hoc log lines and added a re-route log line.