Revert "JustArchi's ArchiDroid Optimizations V3"

This reverts commit 624f27f47c2cc9974d92feea49848dbfc4aa5615.