Remove uuid injection, added cinder standalone class