Code cleanup and sync from 3rd party integrations.