2016 clean up 3