REL-1501: More cleanup of unused code and GUI properties.