Remove unused cinder code

The removed functions aren't used anywhere except in unit tests, so just
remove them.

Change-Id: Id52e8837152fa8654131ca79e50582e03622b765
Merge "Remove unused cinder code"