Cleaned up and added to makeBreakingChanges