Revert "JustArchi's ArchiDroid Optimizations V2"

This reverts commit 9019e2bcdbe6c893f6a8c3559718f9314df407ca.