storage update; removed unused code