Select data cleanup