Removed needless dependency on SAPI client