storage/Interface: include cleanup