Remove remains of old master server functionality