clean up, discussion views wip