Final pretesting cleanup