Remove non syscall writes where needed