Cleanup from web-jayfo
Merge pull request #8 from jayfo/cleanup-migration

Cleanup from web-jayfo