Cleanup unuse code and remark