No more dual storage - unneeded