First pass of cleanup