21584, remove logging