[TIMBO-16523] More work on the code cleanup.