remove incorrect etcd host & cleanup of service files