removing dependency from clients