minor fix
killing dead code
Merge branch 'devel'