Pre-production cleanup