removed unneeded queries