Merge "Remove unnecessary Cinder v1 code"