removed unused code
Merge branch 'master' of https://github.com/Apane/new_work