FIX: Remove client