tidy up TeamCityCommunicator following merge