clean up storage related coded