tweaks
Remove diags