remove dead code
reinstate most set adding and removing functionality for session editing
little display tweak