Revert "Comments & adding a query service"

This reverts commit d03c6bcc51a74e4469dfd9179a51000ca5069104.