Remove unused variable, reorder includes.