remove/clean some client bits