Removed about 1,000 lines of redundancy in ARM7