Remove deprecated pass by references