[MAT-387] Add some comments, delete some dead code