Remove client import