Removing the dead code