Removing obsolete (commented) code