make Storage more DRY
remove unused code