storage: cleanup