entity cleanup on restart