Removed queries comments from code. They still are in tests.