final rename+cleanup