Merge "remove const not used"