Migration cleanup

Addresses #74