removing dependency to clients
Merge remote-tracking branch 'savi/s-havana' into s-havana