remove part time agent and fix watermark issue