Removed obsolete comments and commented-out code