refactor(legacy): render and other code cleanup (#5015)

refactor(legacy): render and other code cleanup (#5015) #10271