Added cinder-cleanup + better code sharing