Additional cleanup on UI front