Removing Clients

Signed-off-by: Markus Jura <markus.jura@gmail.com>