Code cleanup: removed commented (obsolete) code.