Remove etags

No real point in using this, too many side effects
Merge branch 'remove-etags'