cleanup, fix CPUFLAGS in ARM and delete one that was causing errors.