remove support for client. Implementation of rm in progress