[#50560123] Final clean-up and testing of code for create/edit KH.