Clean code: remove some commented code