removed unneeded joins and timestamps