DAR-2415 chat modals code cleanup