Code cleanup for talk.php
Merge branch 'dstockto-talk_cleanup'