Start to get rid of global host object in UI
Cleanup