storage_list.xml cleanup