arm64 cleanup, part 1