Remove Unused Variables and Methods