417561 Refactor annotation related code to remove some deadwood