XX-10812 - Remove unnec. setup code related to fix