Fix client checking
Remove unfinished features