Delayed queue: remove unnecessary method and small refactoring of CommonStorageFactory