Removed unnecessary things