Remove assign by reference on objects