Cleanup Client model
Cleanup