finish eradification of @-pointers