Removing commented code, no functional change