Query clean-up.

Status: Not Functional.