Fixed: minor cleanup in client plugin.