remove a couple of @-pointers