Clean up the clients dir a bit

Change-Id: I1fb8e188044e8a552aa02acedb92c1c9b1d75330