Clean up Trial and add self.all