diff --git a/Makefile b/Makefile
index aa1ce1a03..28033da9d 100644
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,6 @@ GO_SOURCE := $(shell find . -name '*.go')
 GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/lib/metadata.%,$(METADATA_VAR))
 export GO_LDFLAGS
 
-IMAGES_ALL = $(PROJECT_NAME) $(PROJECT_NAME)-orderer $(PROJECT_NAME)-peer $(PROJECT_NAME)-tools
-
 IMAGES = $(PROJECT_NAME)
 FVTIMAGE = $(PROJECT_NAME)-fvt
 
@@ -81,7 +79,7 @@ rename: .FORCE
 
 docker: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES))
 
-docker-all: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES_ALL))
+docker-all: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES))
 
 docker-fabric-ca: build/image/fabric-ca/$(DUMMY)
 
@@ -156,12 +154,6 @@ build/image/fabric-ca-fvt/payload: \
 	build/docker/bin/fabric-ca-client \
 	build/docker/bin/fabric-ca-server \
 	build/fabric-ca-fvt.tar.bz2
-build/image/fabric-ca-orderer/payload: \
-        build/docker/bin/fabric-ca-client
-build/image/fabric-ca-peer/payload: \
-        build/docker/bin/fabric-ca-client
-build/image/fabric-ca-tools/payload: \
-        build/docker/bin/fabric-ca-client
 build/image/%/payload:
 	@echo "Copying $^ to $@"
 	mkdir -p $@
@@ -235,7 +227,7 @@ ci-tests: docker-clean all-tests docker-fvt docs
 	-docker images -q $(NEXUS_URL)/*:$(STABLE_TAG) | xargs -I '{}' docker rmi -f '{}'
 	-@rm -rf build/image/$(TARGET) ||:
 
-docker-clean: $(patsubst %,%-docker-clean, $(IMAGES_ALL) $(PROJECT_NAME)-fvt)
+docker-clean: $(patsubst %,%-docker-clean, $(IMAGES) $(PROJECT_NAME)-fvt)
 	@rm -rf build/docker/bin/* ||:
 
 native: fabric-ca-client fabric-ca-server
diff --git a/docs/source/users-guide.rst b/docs/source/users-guide.rst
index 8f48be6a3..6f81abfe9 100644
--- a/docs/source/users-guide.rst
+++ b/docs/source/users-guide.rst
@@ -1635,11 +1635,6 @@ before 2017-09-21T16:39:57-08:00, and that expire after 2017-09-13T16:39:57-08:0
     export FABRIC_CA_CLIENT_HOME=~/clientconfig
     fabric-ca-client gencrl --caname "" --expireafter 2017-09-13T16:39:57-08:00 --expirebefore 2018-09-13T16:39:57-08:00  --revokedafter 2017-09-13T16:39:57-08:00 --revokedbefore 2017-09-21T16:39:57-08:00 -M ~/msp
 
-The `fabric-samples/fabric-ca <https://github.com/hyperledger/fabric-samples/blob/master/fabric-ca/scripts/run-fabric.sh>`_
-sample demonstrates how to generate a CRL that contains certificate of a revoked user and update the channel
-msp. It will then demonstrate that querying the channel using the revoked user credentials will result
-in an authorization error.
-
 Enabling TLS
 ~~~~~~~~~~~~
 
@@ -1741,10 +1736,7 @@ value of the affiliation (which is 'org1') must be the same in both the
     fabric-ca-client register --id.name user1 --id.secret user1pw --id.type user --id.affiliation org1 --id.attrs 'hf.Affiliation=org1:ecert'
 
 For information on the chaincode library API for Attribute-Based Access Control,
-see `https://github.com/hyperledger/fabric/tree/release-1.1/core/chaincode/lib/cid/README.md <https://github.com/hyperledger/fabric/tree/release-1.1/core/chaincode/lib/cid/README.md>`_
-
-For an end-to-end sample which demonstrates Attribute-Based Access Control and more,
-see `https://github.com/hyperledger/fabric-samples/tree/release-1.1/fabric-ca/README.md <https://github.com/hyperledger/fabric-samples/tree/release-1.1/fabric-ca/README.md>`_
+see `https://github.com/hyperledger/fabric/blob/master/core/chaincode/lib/cid/README.md <https://github.com/hyperledger/fabric/blob/master/core/chaincode/lib/cid/README.md>`_
 
 Dynamic Server Configuration Update
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/images/fabric-ca-orderer/Dockerfile.in b/images/fabric-ca-orderer/Dockerfile.in
deleted file mode 100644
index ae8d3e903..000000000
--- a/images/fabric-ca-orderer/Dockerfile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-FROM _NS_/fabric-orderer:_FABRIC_TAG_
-COPY payload/fabric-ca-client /usr/local/bin
-ARG FABRIC_CA_DYNAMIC_LINK=false
-RUN chmod +x /usr/local/bin/fabric-ca-client
-RUN apt-get update && apt-get install -y netcat && rm -rf /var/cache/apt
-
-# libraries needed when image is built dynamically
-RUN if [ "$FABRIC_CA_DYNAMIC_LINK" = "true" ]; then apt-get install -y libltdl-dev; fi
diff --git a/images/fabric-ca-peer/Dockerfile.in b/images/fabric-ca-peer/Dockerfile.in
deleted file mode 100644
index c7762d20c..000000000
--- a/images/fabric-ca-peer/Dockerfile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-FROM _NS_/fabric-peer:_FABRIC_TAG_
-COPY payload/fabric-ca-client /usr/local/bin
-ARG FABRIC_CA_DYNAMIC_LINK=false
-RUN chmod +x /usr/local/bin/fabric-ca-client
-RUN apt-get update && apt-get install -y netcat && rm -rf /var/cache/apt
-
-# libraries needed when image is built dynamically
-RUN if [ "$FABRIC_CA_DYNAMIC_LINK" = "true" ]; then apt-get install -y libltdl-dev; fi
diff --git a/images/fabric-ca-tools/Dockerfile.in b/images/fabric-ca-tools/Dockerfile.in
deleted file mode 100644
index 5f48d2375..000000000
--- a/images/fabric-ca-tools/Dockerfile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright IBM Corp. All Rights Reserved.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-FROM _NS_/fabric-tools:_FABRIC_TAG_
-COPY payload/fabric-ca-client /usr/local/bin
-RUN chmod +x /usr/local/bin/fabric-ca-client
-RUN apt-get update
-RUN apt-get -y install jq