Attempting to remove unnecessary code