Commented out diag message: a bit too verbose