Huge cleanup for starting UI from scratch