Fixes: #3074 cleaning the snapshot management