Cleanup obsolete or suspicious-looking code#523

niklasl wants to merge 1 commit intodeveloplibris/definitions:developfrom

feature/code-cleanuplibris/definitions:feature/code-cleanupCopy head branch name to clipboard