Clean up annotation in handler