cleaning up client model