fix-remark unused code