Better approach for modal remove.