Remove some deprecated data
Merge branch 'master' into inner-message-content
Merge branch 'master' into inner-message-content

Conflicts:
	data.go