Remove old servername code