V1.0.0/2149

Unused code, better remove po, like this commented one. Also remove the same commented out code that you will find po.