Revert Arm 7 Optimizations/Cleanup Whitespace