Servertype defenition and template cleanup