x
Clean up UI code