One more stab at getting containers clean.