Made the necessary changes to remove the long-standing deprecations in the apps package as discussed.