Removed state checking on query killing