The intention may have been nice originally but these end up being copied anyway :/ Let's remove them now, and in a later change, just keep references to the created objects. Change-Id: Ifba8357c20384f9eb40cd916665ed1fc6dc8cab1
Change-Id: I09e91675fe7d573dad8c933ad513b21d7e409144