Fixed some unused imports being left behind from the previous merge.