Starting UI cleanup pass.