Revert "JustArchi's ArchiDroid Optimizations V2"

This reverts commit 71f284e0ca2ed060e434443d46b7922b0f9e336e.