removed unneeded func