More cleaning of unused stuff
Fixed crash if no data received