Remove more unneeded decode/encoding stuff