Removing unneded (and inaccurage) function