tidying up hostname changes