Before and after image clean up