removed unneeded function calls