First run cleanup