SERVER, SERVERS and BRANCH have now been removed