Cleanup
Added response.
Cleaned up client