Removed redundant code
39 files changed