Phil/clearing modals