Cleaned out the code that has migrated.