cleaning up client-side