Added data removal and update to the tps refresh loop.