Remove lots of dead code and superfluous trace