Merge "Cleans up lagecy annotations" into sc-dev