Add API endpoint to list bundle contentand some clean-up.