cleaned up storage