removed some commented diagnostics