Remove some dead code + other stuff.