#6441 - further internal API protection (final/private where possible)
#6441 - removing unused factory setter logic that makes the build crash