[MAT-387] Delete dead code
[MAT-387-API] Delete more dead code