Remove dev code
Transitive dependency fix for icu4j
Code quality - check-style fixes