Clean-up some code only needed for the 4.2 ct which works without the workaround in the 4.3 ct now (FELIX-2950)