Remove storage API dependency (#477)