More changes towards removal and updating client.. currently some issues