Cleanup after Update to 4