remove dead code (see #109)
Merge branch 'devel' into feature/close