removed unneeded includes and lowered sql queries