Cleaning up client libs