Removed the need for ARM to be defined when compiling