Remove call-by-reference