Assignment cleanup