Cleaning of BGSnapshot

I think I went though all cases, not tested at all