Remove what is commented, no dead code in production please