Removing troublesome function