Squashed 'app/' changes from ab0e867..3c5796d

3c5796d Removed old unnecessary stuff

git-subtree-dir: app
git-subtree-split: 3c5796dbd610853a69b0a5c7755348fa0d196e11
Merge commit '06cccb21c2bd77ae461bec59da82215f9956f9b5'