Fix diagnostics display and remove logging