cleaned up into cinderblock for cinder 0.8.5