Merge "Removed the obsolete code" into main