Revert "JustArchi's ArchiDroid Optimizations V2"

This reverts commit 119e21e1cca451329e5dbf6dedcbafd872e4cebf.