unnecessary logging removed