use a generic server name for master branch
remove old licensing information. cleanup the comments