Merge branch 'ui'
Delete code used to artificialy populate comments