Deleted diagnostic messages and improved display