Modernize the smx headers.
Remove file.
Merge branch 'calli-2'