The merge conflicts which were resolved may roll back some changes from the merged branch (unknowingly). These will be fixed in the next commits
This patch removes unused crate imports reported by newer rust versions. Some crates were only required for tests, some only for tests with macro_import - these things were fixed with feature gates.
Fix: run `sed -i 's,libimagref,libimagentryref,g' (rg -l 'libimagref')` Fix: run `sed -i 's,libimagannotation,libimagentryannotation,g' (rg -l 'libimagannotation')`