data tables cleanup