Lets remove this commented code