cleanup and add storages