Removing what looks to be dead code