Clean up annotation generation