KFSTI-681 cleanup sponsor annotations