removed old UI stuff
merge