cleanup on disconnect
speed up