more clean up for the clear functions