[#74245230] A little modal clean up