Doing some clean up for 2020!!