remove unnecessary UI stuff...again
Merge branch 'master' into uidev