Remove the dead code identified by the new lint