Merge "Removing antiquated migration path logic" into ub-now-nova