removed unneeded files, moved context manager to client level