First round of cleanup and setup