Fix dependency and finish adding remove_iso parameter