dont close the client
Added client index cleaning + refactored