Clean up backfill.
Clean up backfill.
Merge pull request #252 from eric-wu/develop

Clean up backfill