Code optimization

deleted some unneeded code.
Merge branch 'master' into gh-pages