better logic for removing modals; removed hack/hook onClose() - we'll use custom events later