Better cleanup of data