remove domain and server from driver #594