remove old test code
Merge branch 'master' into mac