Before and After Update

First round of cleaning