clean up headers
Merge branch 'master' into nestmod