(cleanup) Code cleanup in client