remove diagnostic checks unless specified