Merge "Delete dead code" into main