client/lib cleaned up