removed some unneeded math