Remove unused JS and fix few bugs with conversations