Bit of template cleanup, cinderblock.xml metadata