Remove further dead code