ui stuff removed -- see refactor-ui branch