10246 clean up and reassembly follow-up. Details in comments. : lego