These changes seem to be unnecessary, am I right?