Merge "Remove obsolete smoke test data" into main