Removing unneccesary vars