Little bit of minor client cleanup