clean up and sort out line client