More services cleanup.