Removing unecessary ownership change