Pre-testing cleanup