Some cleaning up and committing for migration