Remove useless/dead code