Removing some commented code