Fix comments and remove `Obso` remark