Obsolete code removed