cleanup of the old ui
more cleanup