Cleanup Storage structure