Pre-sale cleanup