updated hostnames, cleanup