And remove logging (all fixed)