removed commented-out obsolete code