Pre-Faire cleanup