More arm cleanup...