Remove todo cause it only for dev purpose