Code cleanup.
Remove headers and query methods.