Revert "JustArchi's ArchiDroid Optimizations V3"

This reverts commit a389c6d79a91e5e0a8b98121e449acbb0e887643.