Remove metadata.json.
Add more choices for boto/block_device attribute.