remove webapp dependency on client