cleanup and cinderblock.xml