Cleaned out obsolete code