Remove last traces of brokerless mode