cleanup and removed keys on data removal