Remove some dead code
Remove pointer, and make const