rpearce: Cleanup
rpearce: Clean up lvm spec