2016 clean up 7