removed outdated items
Merge branch 'devel'

the commit.