Cleanup to match latest query 0.7.0
Lint fixes
Remove .methods() on resources/records