removed massive query