Get rid of duplicate cinder file, and makes a few edits

Change-Id: Ib22167d86a3174c65ae4ef869757dadbc16be080
author: diane fleming
Merge "Get rid of duplicate cinder file, and makes a few edits"