Clean up of the pluggable storage backend code