minor client cleanup