trimmed out obsolete code