CR I-380 clean up