Topic/dont migrate deleted models

I've attempted to rebase this a number of times to try to get the third commit to break into smaller pieces. It's been painful. The various changes are somewhat coupled to each other.