cleanup
cleanup
cleanup
IDEA-113331
cleanup
cleanup static final constants
optimisation: almost always one element set/map
cleanup
Fix maven test