clean up migrations and add expiration flag