Remove useless codes

Remove comment out code