Removed unnecessary code.
199 files changed