PCT-637: separeate instances from subscribers + cleanup