Minor (remove some unnecessary code)