More cleanup
Client done