remove old style definitions...
Merge branch 'max'