Removing this to simplify