Change modal into object, add remove and removeAll