Cleanup after south migrations

Change-Id: Iee6d1b3433cbbac121b19bca996d904d2392b4e6