Remove some obsolete code.
Merge branch 'feature/issue-672-remove-old-UI-cruft' into develop