Revert "Add additional diagnostics"

This reverts commit dabd1bbfb1b94d0bb73a1731b5c69f0f111bcd9a.