Clean up annos