Remove APP_ID dependency