Thinking about a theme change, for now removal of excess