Remove Diagnostics class