Fix ui elimination stuff.