Removal of hard coded server configuration