Clean up imports
Remove duplicate META-INF/services registration

Furnace fix upstream;
https://github.com/forge/furnace/commit/1742451b5f21cd47d8155aac6fbfbaac9b6efbd5