commenting out obsolete stuff