Refactor/remove global app