cleand up no logs code