Removed extra queries