First pass clean up from merge