[various] Remove App dependency from hook functions