Cleanup UI related code
7 files changed