remove storage argument from setup/shutdown