KRACOEUS-8566 cleaning up question

Please don't merge this yet.  I would like to do a bit more testing.  However, I would love some feedback.