Remove diagnostic messages

Also cleaned up error report on no errors