Remove references to cdh4

Change-Id: Iff0c00cd65b92d501d8754ffc12a11e79b28e3c9