Removed unnecessary things..