Remove now dead code