remove diag
Remove deprecated methods