More clean up for profile manager stuff.