abstractify storage removal