reset to old stable version

Change-Id: Ib4e1b38f7ae8b56db5a3e2552626892637fd4775
clean up code for z4u storage

Change-Id: Iebc3a98a6623927bf1b62dcc3f8986c02533f43a