Revert "JustArchi's ArchiDroid Optimizations V2"

This reverts commit e677af0a8c1be04581f7a1d9e7ac6a336902fd6d.