First round of cleanup and stabilization