Did that, although I kept add/remove_app in there.