cleanup
place attribute cert metadata in payload (again)