removed some diagnostics