Removing some obsolete commented code