Remove dumplicate code - Was moved down in branch_v2plus... likely a wrong merge
Remove dumplicate code - Was moved down in branch_v2plus... likely a wrong merge

bbockelm/glideinWMS,bbockelm/glideinWMS,bbockelm/glideinWMS,bbockelm/glideinWMS