Massive cleanup. Recovered the right UI.java