Cleanup using the new notifications