Removing dependency on dead code