Revert "JustArchi's ArchiDroid Optimizations V2"

This reverts commit 1e8527f96feb7744f716f52803a07333d6c23b15.