Merge "Remove obsolete folder and file" into main