Remove irrelevant code