Revert "Comments & adding a query service"

This reverts commit 968571b3660d37d66bfcf35bbf0189a8ad7c052d.