Refactor to remove ApplicationUpdater and AdminHelper