One more round of cleanup