Revert "JustArchi's ArchiDroid Optimizations V2"

This reverts commit b9d0146e7bccb26baa22a282ab264b791d1cc16e.