These changes seem like they are not needed