Finish the 'migration' of annotations