pip: remove watermark enable/disable and improve addMaster()