removed old code
Merge branch 'master' into identify