First pass cleanup