replace unnecessary LogAndSource with Log